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

Change-Id: Ic67eed1985854f82ea33c59d88589cad46deda29