Snap for 5582428 from 066f5977b126981ed32ac3850806fa41c5653cd2 to qt-release

Change-Id: If15ebd79a7f0f42aa6cff5d98fb8aa8c6d3a4472