Snap for 5087535 from 5ee074a11b765451d6fbf0a3046839c79f4ea8da to qt-release

Change-Id: I3c1f1db58c259b7e9442962eeb376aa7244f627a