Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I03dd193ab81ad3c6892619e079dbedc392755235
Change-Id: If3d649f710a362b8a73ac90e5b4940b4c29a0a5c