Snap for 5791668 from 11cdd596e5c607a638cbd26556eef8a85e92b9c6 to qt-c2f2-release

Change-Id: I4a60a4fe5f184f9b5b7366fe45b4ca32f3074ecb