DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 4b5830afb6

Change-Id: I89b59ae62e36d37f51ddf31353459d2a540db1a5