Snap for 5096429 from 62c6ee48e83f13585cfd993a04ad93838147fed9 to qt-release

Change-Id: I63adb836b83d67285a4ec47f7ff03812f6fe0e88