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

Change-Id: I9ac44c945ac5cd2cef3cf7f046ba754736423db9