DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: I03a11893025ed4361db58d73aa52b951b61f0ac7
Change-Id: I5f1dd298003fb0c287704dd10aac78aa7bde43a1