Snap for 5636702 from f2adac3e7d4ba4d270bbe19aae161cf8471c0470 to qt-c2f2-release

Change-Id: I659db69fe0061e3aebfe6e397783a97a728cd1c6