Snap for 5791668 from 1c65e5fe70292f755e0cc62905a0b5f111a5cd69 to qt-c2f2-release

Change-Id: Ie462f43770e90f12dd3a85485ea01be527f0d862