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

Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471