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

Change-Id: I2b5667dbbb21f5be830f9338c8cb32d4778ed0c1