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

Bug: 141248619
Change-Id: I4d903961a78a45b5d00e82efac0b31d8301f7d21