DO NOT MERGE - Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: I10fdc070ebf6eb94603fea2a20c0252719fa0cae
Change-Id: I2d3b35d92642ac70ca611fa17293d20c23a76cf9