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

Bug: 141248619
Change-Id: I60647ef0b9e6a625f46d332ae61f95efdaa7fe93