Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I56de1383532958604d92add58f86dfc001407477
Change-Id: I36c3c76ef620780cba68639827aae4d6eea62f7d