Snap for 5704917 from a4b9197e0b3f7e95ec03e2cc8549e7eb59a0bfff to qt-c2f2-release

Change-Id: I948299695e70d05114545acc9d6d775fc6e7651c