Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I9f3b573230c3d7c96cfbb03b657068fafbc603b1
Change-Id: I0193aa3d28af1b7c5ebd9d702bb6d876b111df65