Snap for 5785721 from b672a3f6f64fc85f030db7a65b77d6911b0a6870 to qt-c2f2-release

Change-Id: I74ee18c1b9f1772e31b72e63612203a5dda9a0b5