Snap for 5480912 from 5735d05cbf76234def9c8e7d7275654e77273a98 to qt-release

Change-Id: Ic547fb13f19f89c9e86f6f621cacdf712077d4e2