Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: 0eb4ee71b0" into rvc-d1-dev-plus-aosp