Snap for 5087535 from a23b567dcb7e35739edae72a6e549d794a207596 to qt-release

Change-Id: If4e8290319f8415391a4f8687eb93bb8af636c31