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

Change-Id: I26ef047ba9a503aa8c5ebe057e95954aaf33c396