Snap for 5781865 from 9eda660ff9969e5aba009bf0ffbf7f055806fafe to qt-c2f2-release

Change-Id: I2e7286b8c5a6ee59410905c1919458eeccff53bf