Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I0e8cd9758bf1b8852b374bc658e6c3023986c7db
Change-Id: Ia843500ea9779f9eaaacf459054f357b90f82f31