Snap for 5674532 from f928f0a5c3d017baef91bd2e96c1e632a42cf373 to qt-c2f2-release

Change-Id: I0aef978c2ab288f74954395d6a255f55a0417629