Snap for 5386257 from 58d94c547230b0074b7af73dfd040ea4b92216d5 to qt-release

Change-Id: I0712e24c754048581027078dc4dcce460b0be28f