Snap for 5480912 from dd3667e8bb1cd12e3b84388c2b92c080fbef39f3 to qt-release

Change-Id: I0e3fb60c127663c5bec35e5fa7625da4c89eb52d