DO NOT MERGE - Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: Idb497e120c35202fe7ff3bde0dda12b2b816dfc7
Change-Id: I5b20f1c874dce5e2f1e53f322f68753db91e589f