Snap for 5045582 from 10890087d9aabe4a4fb487907edcc824b8402f96 to qt-release

Change-Id: If2a88c15a5b5906af5a0d4f0641349d20ce55c55