Merge changes I24d33b94,I9db3c5d1 into rvc-dev am: ade62d5627

Change-Id: I304fabf5b71a093b3a7d53a48cf826ce0a06f0b3