Snap for 5730727 from ef675ca9f5cbef083aa49cc34fc18d97a3b16af9 to qt-c2f2-release

Change-Id: I4d6d39f606fcfe085beaec1a1c668f274ebe1af5