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

Merged-In: Id3111b2a3afc6fa402a12735c9da7f420c23a10b
Change-Id: I63d9f6168e33ee05faf36785c7e9d3dcd5e9e309