Snap for 5647767 from f9fd2653fa56bc52e178b3fe7ba5dc77c97b21b8 to qt-c2f2-release

Change-Id: I37b41bea56a2771a1efbd52d4e634c8c3f41046f