Snap for 5626642 from e206d8a15d1f50b1ee3c9ba076d70ba779e58b44 to qt-c2f2-release

Change-Id: Ic25b2ede8f596b070c1b9fb8c5081425274e4aa6