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

Change-Id: I8c4cb1957837467a60e74ff3d88b56959208bc92