Snap for 5674532 from 72ecaf05fb86ab545377345822e3d6ec2061dae8 to qt-c2f2-release

Change-Id: If6ae20867e2c2f3b49f755c3ee0e0fcf14e87409