Merge "Merge changes I3f220769,I4c9af08c into rvc-dev am: c1b17d65 am: 0ae44e1b" into rvc-d1-dev-plus-aosp