DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: I81fcdc717564d4692720e2d55be8e11ea997e9cf
Change-Id: I97e6de2a60d681c966b4d458c23ef36b717d10ae