Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ica1e1d90f13d4195ec2eb62ed2255f5b741e048c
Change-Id: I91a64c57baf9bd83f4117dd2ec4a5af3f3a59a45