Snap for 5743241 from e151ed6e29fe353a26984a30077f8f30adf9cb86 to qt-c2f2-release

Change-Id: I419dc51f4744bb131c93e8b808e114b5d1b1ec7a