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

Change-Id: I21d0082645a34220510b165f8f41fde2ecdfbc1f