Merge "Merge changes I50d5ce3a,I84a636ba into rvc-dev am: 4181d96a am: a770c943" into rvc-d1-dev-plus-aosp