Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I1386743bf49852a303156bea3e054b67477c5944
Change-Id: Ifeccbe0abf37251e8d49abed5b46847820cb2227