Snap for 5537346 from d4fa2de8bde26f16d17ae130d24d6c4da718f510 to qt-release

Change-Id: Iedfc014e298e5e648dd923e66133aea10069eafe