Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Id5a4179bbfbbccf2fd72f2637af25217d9892f73
Change-Id: Ia8dd18b7991cdbd366c5db04b31ed2b9e979f86a