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

Change-Id: Iac23375cf5d065a5047b39cf2b721c8cac5d8555