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

Change-Id: I0debfb08ac9ca5c188dcfb77593e5b237d6bb5ad