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

Change-Id: Iad8f8de289c22e301938dfd61c9479996a224286