Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I69b76603053fa88c407d2401a9738cac216432e4
Change-Id: Ifbff1cf92aef101c70ac9094117295e1bcd665a5