Snap for 5058806 from ad0af835dac738ff86ac4a1f5fee0d1991f4343d to qt-release

Change-Id: Iea1e75e60d1db0c1a31325194dc37c02b1c4a608