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

Change-Id: I80ed56c3fced617e5135b48d9f4f33ac268af06a