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

Change-Id: I2c5c7234075ac351cb60ae463cef377e8153d873