DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: fd4749d28e
am: 55fa2b769a

Change-Id: Ic69f39f398459c5def5f699d34203acbfb3ca114