Snap for 5821701 from c9358ed664a8f29c5a1e7227a7fdb8094b21ace2 to qt-c2f2-release

Change-Id: Ib056ef2c922a499d05fda674cc0e39f74204391c