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

Change-Id: Icb9b966ab8e28fcbd31ed9228d566094db752891