Snap for 5674532 from 29dbc10cfe56134d4c1925219b9d8c06f9b5b1e1 to qt-c2f2-release

Change-Id: If951e237f7fe614d972dbfc5e2432455bd11a5e5