Snap for 5434517 from 5e0d361585bd284baa224dc54f24e8bfb54db6bc to qt-release

Change-Id: I027f3bfd5ab821e3444e8489290ac7d17b4c041e