Snap for 5716220 from f097efb82f768a506ea0dbe63cb49126faef3a3d to qt-c2f2-release

Change-Id: I0f2a0418ccc7a8a0baacf7a98a9f72f2af57cae1