Snap for 4818218 from 8ebd38d674c8804fd8af1ce293dd72be2490fe95 to qt-release

Change-Id: Ief5e0d50527d62635f7d27e3fd37718d5a5057e4