Snap for 5512005 from 31b2487e9d63e508d4b0b749a724d0814ef670c6 to qt-release

Change-Id: Icae72add2b8ec7526eb0ace0ef83023e35b849d2