Snap for 5647767 from f13ef3dec580333c469b7ef43660dce969076072 to qt-c2f2-release

Change-Id: Id2cbe3376d388a4809d84bc2589266fae9b8f8bd