Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I05d52262ef02cfe3146cbf685acc1fe448676204
Change-Id: I14b94eff504eee3e18f9b518691670f93f971952