Snap for 5333170 from e0b52d97439eeb05d8ae81cfb9ff5599d35c2ac9 to qt-release

Change-Id: I690fed23d4f7b871acdc73e7cd116a3692af48d3