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

Change-Id: I99dabe471772dd270983efaa6edd19a21081b09b