Snap for 5174203 from be964620a82a9cc171ea6e53db6f558b207e7c8f to qt-release

Change-Id: I505f258a454a0c7894638c82ea6bacbe89062991