Snap for 5821701 from cd4a6376e1e6033679ed56a7a6ed9ba9eeeeb38c to qt-c2f2-release

Change-Id: I6905d0235e10fdc61a606b82f24f7bc6ce9b8f59