Snap for 5204403 from db0fc4debef41fb058e9f7e198ba399f7a4bffec to qt-release

Change-Id: If11ff05117253ece8227fa305c9f2a6ca37c1361