DO NOT MERGE -  Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: I001adb29a4c064620c648f8670690b900265cb8a
Change-Id: Id85a6d722a80633063f049081376c6e3a15f2c31