Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I884eedaaba19867b8bfa0366ad858b4c286f6202
Change-Id: I4240da3265ad35eb2e6ec79939193e43e2ba4fb5