Snap for 5626642 from 31ead9c0ba696cdec698f08ea841133e0e89581f to qt-c2f2-release

Change-Id: I70624ab349cbf5c5173b00fb407ba20cccca2700