Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ifd6ed878ab1907a2e5be444cf6b7bfbfc96d3e99
Change-Id: Ie0bc18c098773d48964ed09145abb3af28e4ec7b