Snap for 5713174 from 2aeb9b87f3405da26b25e224881a79eca80036d4 to qt-release

Change-Id: I4a711a9e1cc55d38838ec301f3abbfd21a783e06