Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I86a95c3767c48b6a64bed062e26a116609fa8221
Change-Id: Icca4b4051e5eafccf5c37a789f3d94d471e81f8f