Snap for 5490587 from 14f0d8af6e57d083d7ab77de5de4e49b94ca8c33 to qt-release

Change-Id: Ifd769c257e7cf83820a2e7aff614376dd30280e3