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

Bug: 148878042
Change-Id: I62d48fad449cae9233fb5c0d505593b17e9b6238