DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: If07afd9af680cd2a5ece6506df5383e5cc258663
Change-Id: I0b6503970f4a98b037a35ad61944f2df8969bf97