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

Bug: 141248619
Change-Id: I16430cd47a965a54608e2ecd4ab3c9ed1fef8578