Snap for 5040318 from f322456bd82a2f7107e9f06122d209432ceb9718 to qt-release

Change-Id: I42719a45e986daefbb6254c171728f5e5fed4702