Snap for 5736565 from ff01873f0788ae024264466d5862eecc699e9d16 to qt-c2f2-release

Change-Id: I0e4fec81501a7066c2810b6cc1b17cd6b29a88c6