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

Change-Id: I2d0436edc5b1a8fbba1c9841880601bd8e0eb31b