Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I719a82627239e6bbe937752622ddb209a8720772
Change-Id: I2b3819c764cef6e1521cc56af24ad60fc6e6ffee