DO NOT MERGE - Mark RQ2A.210105.001 as merged.

Bug: 180401296
Merged-In: Id1351d1d694e96564317e12c79a2484fd33f762e
Change-Id: Ifa2323c69b4f72fb02aeb4330dbbe12b3ddcd172