Snap for 5430508 from 91f73103a010fbf6006c48fb76543f3e8e1f19f6 to qt-release

Change-Id: I1a4f8e244668795708835a44a5597b5d5186abb3