Merge "Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e281 am: 34db4a60cb" into rvc-d1-dev-plus-aosp