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

Change-Id: I96f9dc9f73eb54339a2f3cd7d8a68c5c52dc6f05