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

Change-Id: I9717935934a978a78c1f52d9856c9657a0e3db4f