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

Change-Id: I8c7221d336d35592cc4fc4c17e4450209f48c7d2