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

Bug: 141248619
Change-Id: Ia88438d2da134b522b41e6b5545ba01e4e7b6e4d