Snap for 4896767 from d6dcb9ac36f89f1119bd48b308389212989ff22f to qt-release

Change-Id: Iab751e1051f5aa76612bf3b7010e6b20675abb18