Snap for 5791668 from 972e75d20fbdcad098b3d8d43088fcdfadc8d99e to qt-c2f2-release

Change-Id: I6f8742db04071a05d537f09a2f8b566f77626d62