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

Bug: 148878042
Change-Id: I54c668427c06c415584cc80d6e7d35d451b28393