Snap for 5096429 from e8ce6aec0b760eb64f74171449b8af752c3f8070 to qt-release

Change-Id: I8d730c6dca19c38408601139db32e613a2745ee1