Merge "Merge changes I7c542db9,I6f809ce2 into rvc-dev am: dc1fe78978 am: 858ad5e7d5" into rvc-d1-dev-plus-aosp