Snap for 5803801 from c6d098fc109bf4ec15eff4de2ad61c8a7a91740a to qt-c2f2-release

Change-Id: I2ae303d182b4debe1c2857a1c892219003b7bd5d