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

Change-Id: Id608e9c6cee68aef21c0a90089fe2e534e1c8d5b