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

Change-Id: I337ee43aadf160370258ebe347269e43173ab61a