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

Change-Id: Ie9e455c69c574b4f22f65c91a82305d95638f508