Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Iad97a12fd29cfe2d36a1642d22bca5f876e6f004
Change-Id: Ib4a573769b50fc18876a8c36ba02109139ff86b4