Snap for 5045582 from d258f63956d122e2ccd739a87062452600df47e1 to qt-release

Change-Id: I951b2e11a10f4dcdf04a5b5cc483d568c4384b05