Snap for 6105141 from e6699a99b09b25c499800dd91883b9f0f4011855 to qt-d4-release

Change-Id: I5a7485152f0568c3e62e48a651ab4168b7b4154c