Snap for 5801051 from 483f9d6ad7a07505eb86a584c3268b326cd75295 to qt-c2f2-release

Change-Id: I735776fcab9eb14cb608bc4d5da5d4047df28087