Snap for 5333170 from b2aea8576e3928e9add8b616740e56c1c5a811d2 to qt-release

Change-Id: I8a5d5f1022fdf9c26133814d7c7574d65a4454dc