Snap for 4984036 from ecadedc902e31b1b34d33e3be080c863d04f5193 to qt-release

Change-Id: I1ac5dae17b7a5cc66cc684f413b31d4339400b18