DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master

Bug: 150410372
Change-Id: I34065f68bc626d9f304feeededfd8cdf1d381101
Merged-In: Iaeb2f46ab8156dcb9adbf5a8b463c795c7bde131