Snap for 5611873 from 9925679a3deb5cf82bea414ea453950e1e9248df to qt-c2f2-release

Change-Id: I9aee7c886c5ef4845c7430eeac48b5e534abda4a