DO NOT MERGE - Merge RQ3A.210805.001.A1.

Bug: 192585466
Merged-In: Ia59916dceffde1f4ddee77780cf5dc9b4f2d47fa
Change-Id: I3bda73fa1b086ed946ab76a28873defe97394521