Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I967cf8d0f42ec2b9745ce7bd95c7762e032c90d0
Change-Id: I3104c43c60c68ef1206d90858d4aaffa26a860c7