Snap for 5228332 from 30068f47a66770337d43fd913005bc2338b9c75a to qt-release

Change-Id: Ib7118f116cd7331d95b520b4f4ac06031c8b7c1f