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

Change-Id: I7278b13761134cef89953ad0fe5d19d3131af674