Snap for 5434517 from ad96b8cf39e13f7349939f0262cd55a9a18ddc4d to qt-release

Change-Id: I80e2061b4538533bbeedf5d3226cb381444e0e49