Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Id8f7ca2f2980fa9538be94669f11aab59bfa5ede
Change-Id: I48fe0c11a6724ab4563d65e1625a360746be2931