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

Change-Id: If4ed8c5980bf0c09b8419d86b6fbdc98c54c483f