Snap for 5691653 from 4eef244fcb822a91ce5df3eeb9d27719c328d2d5 to qt-c2f2-release

Change-Id: Idffc6bc088f6f32e4386e90e0375b8212f5df8a8