Snap for 4896767 from 1f2a6d8b6ea6a1e2c30b46b8709b723ec20887d0 to qt-release

Change-Id: If53fc527b9d569d0b93a04e4680a1536ba225196