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

Change-Id: I8358d9232bcd14ffb280d394ba1fb30046ee7c77