Snap for 5017438 from ae808fe60a40d9436ade616ce06f36a2517c26cf to qt-release

Change-Id: I64c59c17681a78bdc84c871ffb8665851dd49c46