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

Change-Id: Ic05c6b7b9821370b38089f93054818b974b5a443