Snap for 5304721 from 388b47ab816e2d06c354e8d31aa13a9034eaf366 to qt-release

Change-Id: Ice51552483656492e43ee46ddc0238ac71390e42