Snap for 5616560 from 4ad6b4ad503cacc41f9a67c1db42fe3de0f0bfdb to qt-c2f2-release

Change-Id: I27e06c31a36bd29c9d9556f9118dd7387ffe5792