Merge "Merge changes I24d33b94,I9db3c5d1 into rvc-dev am: ade62d5627 am: 5dcacf7967" into rvc-d1-dev-plus-aosp am: 6ce5dd6184 am: 1178f459ab

Change-Id: Ic4ca50e05ed106f5cecf858464153d3e16a34937