Merge "Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881" into rvc-dev-plus-aosp