Snap for 5503058 from 6832185dea7b0705f96128e598bb138610f23385 to qt-release

Change-Id: I0deca772b9a5ff847fe16e50c9be1dab2216d6de