Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I0129815f688de9b81b6249eba32a2d39ea6993fa
Change-Id: I36f26446a73f6dffff1829bd16be4fa362bd66c1