DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: f07d371513

Change-Id: Ic7776a9a63b7858281e00232a941143e7cad9a2e