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

Change-Id: I21d5cce75569fd8edc9bf48e5d3e87e6a12ddfb6