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

Change-Id: Ic34d60c149c00abf9a33229f77c2aa15a2d7250e