DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master

Change-Id: Idfaf7b930a2cbbaa9d00572b72573aec6e9a9582