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

Change-Id: Id217fe63c679028981bab7f9958aba678a19d7a9