Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ibe29e933edd0b6b53bac4415db6f9419d874b045
Change-Id: I87353bb7ea56b9bbdeee83d899c7d8d605f4ba37