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

Change-Id: I53ee709b7e4c19590646162b4cfc9df6c6053b8e