Snap for 5333170 from 3d36ea54c2216475d5e21da31ee0db4af24ebed1 to qt-release

Change-Id: Id7c07ae77d86bc749e6efc323d6bbc5309717e84