Snap for 5726890 from 30f0c5d6ce42957fe417b5d737a7f7f1f7d01895 to qt-c2f2-release

Change-Id: Id6d2c3bfaa05c6f230258a5827576c4425a1adc8