Snap for 5333170 from 043398f5c456fc78cd8f5f2057e3a2e767eebfca to qt-release

Change-Id: I64661ac5ee326512e11e12e0a79ec407d8ecab58