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

Change-Id: If82ff4f862e695f60adcb120758ab541634e7ac7