Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ic5bc3e1ac76df11ff13a9be533d044cc8dcc296c
Change-Id: I2360f2b44a6a4eaacc59714bccc99d4322a4b596