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

Change-Id: I4f8b60463d302305db7e0efea7f9664d799b61a4