Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I64840c10eb56a5932abe08370ff3b010106c56af
Change-Id: Icca895a82ca0573eaeecb6f896857bbe5ca20605