Snap for 4674419 from 9ac321936b1ff0723347410664ed5ff51de2df8f to qt-release

Change-Id: I6e4773e4d45ac71cf12e964ef34056f3a3b48123