Snap for 5017438 from 177408276794aeb9b8cc720f8bdf76ab838e7c6f to qt-release

Change-Id: I9e28bb590db90500b8fb6df140a9f6ae486de359