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

Change-Id: I6a629a003b818a7bdcfd0db4374676a2c07aba5c