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

Change-Id: I9212c7cc6d5e944bc63cb6dd4fb78dc3accd9c5b