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

Change-Id: Iaa4627802f47639c3ee2694ffec999352df5a089