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

Change-Id: Iea6fe696b99e3187a45641ea5a534064d243ff2d