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

Change-Id: If3d0f19f7347319f421fd0e56d224342045a91c8