Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: If48ee09592e5ad13bd3609e8434040051d017574
Change-Id: I07b2e5e532d94a487d7a86b4eabe552c801218ad