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

Change-Id: Iaa867b686d6c8330fe9639094735c20c99cd3525