Snap for 5567188 from e970ac4c95e2e1016c72caa5218fc8f1bafe58fe to qt-release

Change-Id: Idb74d1d21d96ec193e2d814bbdb90d6ffcb18bb5