Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I263d2ccbf736e437ba320d6283264a18df12ef12
Change-Id: I4c784f3d31517228e6109e81119106d63affae82