Snap for 5652689 from a24cefa598987f591e50f50cc5711c3ac677425d to qt-c2f2-release

Change-Id: I13f2129babc616e1b8813354613506cb9200e83a