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

Change-Id: I6725f2e13158dfd63d19f48a1e9049dea506d43f