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