Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ia015d92a7c4855b41c068e9c1e8d623dd5665a40
Change-Id: I92439e5e4d5481775b719554e70f65b9e293dfba