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

Change-Id: I30fccdfbdff6d3075605f73fcc67f0ea4990b9ef