Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I1c93b79026c527984a1bec1506797703eb5e674d
Change-Id: I7fd4110629eaec14ad4100c7c78a00a9213cb6bd