Merge QD1A.190821.011 into stage-aosp-master

Bug: 141248619
Change-Id: I2e59e38827e5a3dc85445a0eea564088502a84d0