Snap for 5753328 from 4f68901b5baa0ca051c4bcee85fe18b9908331cd to qt-c2f2-release

Change-Id: I0c16b8a401b4b682b34624769c2890a6cce906b3