Snap for 5025290 from ae61f262e1693ccf6f1c393d5a10dcdb93b0ab37 to qt-release

Change-Id: I5125a2ad8db3e3be41486a8a91781443737c0171