DO NOT MERGE - Merge RQ3A.210805.001.A1.

Bug: 192585466
Merged-In: I1c1b800737db5397d3e600e30c12ed2c8fc8efd9
Change-Id: Idca538ed6f4281a09e05555d15296dad90a03ea6