Snap for 4704169 from 0e0dc9eefb1226163a215ac3bac16dedf15d88f9 to qt-release

Change-Id: I3423ee31a2e6ca4c4e79a32aa7ad9d2c149ea74b