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

Change-Id: Ia9c2f0113253179c30e9b75a57fed937f38a18bd