Snap for 5090430 from 54ef7dbab68d0d5e0f0f39f0ffedc5f40807d371 to qt-release

Change-Id: I4ec5c7850632f7de564d0a5a092c4e903c8ce36e