Snap for 4792730 from c9bc47b60f8513944d5e894114286f5ea249bb7d to qt-release

Change-Id: I6f0be3c8b473b7348ed17860d8cba554c94321c6