Snap for 5246489 from f01e56783d3dda2fc610cde0c55d1c458cd235bd to qt-release

Change-Id: If75855dece14514c9295e7a695971ba202b91d5d