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

Bug: 148878042
Change-Id: I0ea1d53b0813228b3cfc7820acbdbba0d86d8ae8