Snap for 5401728 from f6a7e0f4f499953a1efc07967a51b6cfd1eab16c to qt-release

Change-Id: Ib16579f97b51fd108bdb6a50d7e6272869a3f34a