DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: Ifbb111dbee0429d8aaea4688c0390ee80e25cb22
Change-Id: I8f6ea01c2aba66ed72afb27f3b21aa1daf83a432