Merge QQ3A.200805.001

Bug: 162879794
Merged-In: Ie8384a6e6901f6ad035963d585393c9490b2b931
Change-Id: I5b95e91213c4cd779816d6fb373044fc565d5f8e