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

Change-Id: I307003cb8d6311ed3662535a54ac8586b8a25bd0