DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 861b9df2b7

Change-Id: Iea70dc3527c976f33b18a2a027bab425b3b447c1