Snap for 5304721 from aacc7efec651e15d0053cb3315db7066943b185d to qt-release

Change-Id: Ifc172500f6ef081ed1db92f58d51c5d209ced666