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

Change-Id: I9947fdccec813adcdbff2ce9c174e69e8286dc9d