Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I4fe471a73c6b261295610bb5f04aa964f4bae6af
Change-Id: I84197375f405e67a730f70f82f28b0ab40e7fb46