Merge "Merge ab/12162526 into stage-aosp-rvc-ts-dev" into stage-aosp-rvc-ts-dev