Snap for 5663715 from c58c10a973d5aa9206ed7f6dfb64a733b62ea63d to qt-c2f2-release

Change-Id: Ieca72daad2b428c421f0f68cc770333928762278