Snap for 5788294 from f9ac079d5db6e70c2c0ead8cdb15cc1a0c8c43c2 to qt-c2f2-release

Change-Id: I48a721da4585518012bcdd85f646bb289137a856