Snap for 5187456 from 7b49244f043bde12856f3359d1c9333ab32b380c to qt-release

Change-Id: I8002bdffac825eb8705c36c9f8c1eb05dcaed1c7