Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE

Merged-In: Ic1e4fe23fb2c9327a97179297f4dcaf2eb8eeb4d
Change-Id: Ieb29d26da1e7947e06620d2261c5e0b20ef9fce6