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

Change-Id: I889932499f57f52c436915493cca7ff80b787af3