Snap for 5702333 from e303383f776f126157c882dce7a5b2031253373b to qt-c2f2-release

Change-Id: I871ba446ba56a0f202ea1100c5674f4b6212d547