Snap for 5626642 from e7a6c4edfa7b2cdd492804628b39f3db30b1d346 to qt-c2f2-release

Change-Id: I5d62d66eadeb7ea4a0720c9e472be26d60a1d23c