DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: Ie0334fddf5ad08b1c90e2d5c41ac48f325e1ab7e
Change-Id: Ica9f1ff7dbb9addfc8b4b1fa0a20d716d1e2b763