Snap for 5821701 from 9b94c35a54ef061284f9de04f03b75fd7388fe3c to qt-c2f2-release

Change-Id: I6ce0f15cc74432d5005374d127708458ddcf3efe