Snap for 5096429 from 9c7f7aff52038eb742e415f3dc870b9b9555f255 to qt-release

Change-Id: I8739621108b4898964d82752cf8a8af74c685d2d