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

Change-Id: Id06a1fd7e6c42f9b34bb98dff16a853f4228a4f9