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

Bug: 148878042
Merged-In: I236e5c9c16b4ba730677cd4c980a7071ba25840e
Change-Id: Ia102f1a63fddcaa43365e35680ea04242fe2ee80