Snap for 5480912 from 6569f35ae08b5de4323ae52be47f73e4ecb58ae1 to qt-release

Change-Id: I5f95283d111e2621c337f7d6eefe0bed5e02e191