Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I97d3e4ab95bfb4be0ac191e0178dc7b4af7b7155
Change-Id: I06b5093f46b588e660bca306daa2a33c36fcca13