Snap for 5392835 from f196dd821df88ef9e671981fa789746c5f868cea to qt-release

Change-Id: Ief91ec638f7db464119d3a2af070addd2468798b