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

Change-Id: I752b89086176f54b1f5f302a617adbac1622bcec