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

Change-Id: I0068a42713cf9ee6f976e278baf06b56c5bf3add