Snap for 5235151 from f5b3d9bfe0bb9917977f096d4a9964acf9f32fcd to qt-release

Change-Id: I952ae7e7f6bb79a00cb41d443011798ad674197e