Snap for 5304721 from cb41712d70eab6cab3663d328b89175d0b4695a2 to qt-release

Change-Id: I63728c4115634445d082eda34f1bab22fbd7a05c