Snap for 5025290 from 543240cb43c97efba543307e7b2f71bfba5ea3e7 to qt-release

Change-Id: I46c6727cff3c63484df65bae779a95617384085f