Snap for 5670726 from d5977ab16f26ff7be7cc02b06f013aaa74804371 to qt-c2f2-release

Change-Id: Ia30d7358a2e457ea3a9500e8b34d27d8651e1f1e