Snap for 5590748 from f0b6f54915e045a7213c67f86d9c6224c8787b4a to qt-c2f2-release

Change-Id: I09f0841e955d14d700dc2275d3c994d8abae00fd