Snap for 4957512 from a89dd7aeacf1e6587813c6c9f5bc6964d78393bc to qt-release

Change-Id: Idb6ba5f6ddb6619085f485e3dc79bd52b581da38