Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I95464c43c8c735801672c7218feda09c65ed5e47
Change-Id: Idfc7034fbf6d4133364716899a7330d1fb194845