Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I54795d503cc9588689b19ae8e53cf0578a3cb6d0
Change-Id: I8fca8ea34efb1df9d16f4179e42d8bdc29ebab88