Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ia11967c6f4cb86b5431cdb446a5b5c483ce09ba2
Change-Id: Ia4cca2b1f45bd269b90f9d66f40bee7b66e07b5d