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

Change-Id: Ie6b328a31658515afdfeac62e8b21814b2880b6d