Snap for 5246489 from 33015e4004f50cae9ba6af05a38caf2f800121d8 to qt-release

Change-Id: Ia26e8c684a6c1f8f879e15e9237364a8f73debfe