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

Merged-In: Ida4af108e86b538ab64d1dea4809cfa3b36f74cd
Merged-In: I598802169728b46b0e6592f08d05936f9846b252
Change-Id: Ic188f4755abb38c71fa11d534add3f0ee8ad353c