Snap for 5726890 from 0781aea9acd0cae553c9bcebac084f95b1ff738b to qt-c2f2-release

Change-Id: Ie48aa0ec051395ffb271d78a5f32985ae041709c