Snap for 5674532 from 65ec8dca7c01c00a43ee614094bf5b5a2328e68e to qt-c2f2-release

Change-Id: I17f42d1f4271716c01f138458e1c2044b04fc6bc