Snap for 5558509 from 3f329277ab6466910d8fc05a337f66ea19cd0df8 to qt-release

Change-Id: Ia9fc6c81de375f03cc0482a9ab57cc759bce24d3