Snap for 4874590 from 05672ab56589f6339388f683a7e9d9ddfa745e7a to qt-release

Change-Id: Ic0b9d4d82d846cbb9e4bd9dac12ddcf783d51e09