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

Change-Id: Iaf36591943b53ddac18eeaa20eb722739ba88121