Snap for 4736303 from cc872b700bb1e9d7072bdcb331f036ba203df90c to qt-release

Change-Id: Ie7da86dbb265f3bcae8f46e8ef4b8ee08def3f6d