Snap for 5606075 from 7742a9d65032d6db0d2c1bebfccabf5f9b083a23 to qt-c2f2-release

Change-Id: I90c8c9b2f0499be2a702dfa1834a3057941d0a17