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

Change-Id: I184b5e062611d6e8615675123bd5d29a3e535dd3