Snap for 5333170 from 3e6bd0ef0c68250e04efab06e3d8bac9a723a79a to qt-release

Change-Id: Ic60eb595e02b2ff5a4dcecb965e0c94c87e6ae34