Snap for 5667572 from f85b573d073738e253ace96f4e047617f519a6e6 to qt-c2f2-release

Change-Id: I3f3dd14bdbe7c653ebc63ae681dbca1543ffdd87