Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: If818e3387646f6fffeef422bafe580543b4d8c57
Change-Id: I8fce2b2ed45dc15998e230935db537f9e3daabad