Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33e am: c3d6c281 am: ae8b7640" into rvc-qpr-dev-plus-aosp