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

Change-Id: I5aafc8bd3a2b9173926a6a3ad34913ba0648a7b2