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

Bug: 141248619
Change-Id: I3a745ac766327f5efd2f79a1daa6b4b8890b1a42