Snap for 5611873 from b3be7794679ba91af5f6fcf7ba0e269c2069160b to qt-c2f2-release

Change-Id: I32a8df967e6fe99f00fa606361bdd615c9ac0fd7