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

Change-Id: I8aa82024f79fcc7ac8b38c7a750d909230b2dd69