Snap for 5807722 from b1b562e6660da0a8abbf2bf52eb1dcb1113d617a to qt-c2f2-release

Change-Id: I0a867e8c2a5e1daaaf9d7f50424a9e2b6786ad30