Snap for 5333170 from c404e0140287f20d98b19e4fc8586c93cc489dd5 to qt-release

Change-Id: I6ed990fadd1e02db2857c1ef51775396f804d1db