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

Change-Id: Ic5b873ac47f8ba7b87a10c18071f5cee60d53c93