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

Change-Id: Id23a6cd024ffbd9b5287c61d81c09f68ada0bb66