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

Change-Id: Iaedce822ce9ce5cf9979aa296f68ef9ebb8bbcfa