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

Change-Id: I5663f9b3676017b6ed860b7b26328bc4be06e3fa