Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: If5632242998efaec63c3e14c3528d19fcd6b9610
Change-Id: I41dda7e8bef73f494fe504cea63b7a919cf2ecc5