Snap for 5096429 from 6ba8cd062ab6f0b9f90f3e12cb3d2b499a7399a8 to qt-release

Change-Id: I249749871c125a3990c173275d836f613534e216