Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Iacddb8afef9729cb7096e3247178b87409942437
Change-Id: Id15f117612b53582388dd2e0d6978521ed6c565d