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

Change-Id: I1b415a2f8d5a9371a20e8205f292b221b2c51990