Snap for 5333170 from f9d0bb69baae6a0c386e94d8c93372de3d3278c6 to qt-release

Change-Id: Idfeca0154f6254638b1c41ca1cf03c0f0626b248