Snap for 5533229 from e308abd33006e46fc978ff7881bf43222afbca95 to qt-release

Change-Id: Ibfc86f5532ce67eac97a0aa51199a87d46d1ca0c