Merge QQ3A.200805.001

Bug: 162879794
Merged-In: I1d3947d2770048bb7c2c9a0202e5c6d0aaa1fb91
Change-Id: I015d1dfb567dd725ef554fb2699b7fd7893866ae