Snap for 5333170 from e0edfa08a7aa65456aa71374c99c9a1984c77ddf to qt-release

Change-Id: I0f6e967dce76c01017ca7feb5d28628d28e8adc0