Snap for 5821701 from ad94b0f3bdc5a1402d8ebdb7d92acbc4a2bb3c07 to qt-c2f2-release

Change-Id: Iea2699a6c58355082eccfbe3baaffcd45bca514d