Snap for 5803801 from 0c5f26bab85bbacaa87b33692bcc29a3c1dea021 to qt-c2f2-release

Change-Id: I05e28eed45918898dbc2f820eaf44b59c49c8466