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

Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac