Snap for 5730727 from 640ead1a51655a50eb17b3a8ba989ec95a75e7e1 to qt-c2f2-release

Change-Id: If2ef57a1dfe0485046d57b3a4335a9c796145c43