Snap for 5817401 from 4492996f04
to qt-c2f2-release
Change-Id: If3b92847792b21c6038c484c8c918eb225a8a403main
commit
e0b5b0e556
4492996f04
to qt-c2f2-release
Change-Id: If3b92847792b21c6038c484c8c918eb225a8a403main