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

Change-Id: Ia67c3df04115fb4fd82a807e01e79ea9cde882c2