DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6bf3c94558 Change-Id: I29115739b2839b7865a75ca935ef3c846d1f7ef4