Snap for 5333170 from 8c6817e1c67b557aef6d9df3e4f5eb22b456aff2 to qt-release

Change-Id: I9c29d01a661856833adb081bf28db0f915e08cac