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

Change-Id: Id3581bfec0e9dd780ab34b3d6b4d3d24d26b253b