Snap for 6278840 from 9f989b40f13e8f451a68106106c1beac5b751d42 to qt-d4-release

Change-Id: I8f06c482bc7d9e16ce4e7a53a5b2846af8c6e36f