Snap for 5704917 from f48f79b2f7762d23ac632f25e020d938b80df4c9 to qt-c2f2-release

Change-Id: I70f41bf0786ab6d54e8d5f37a2e90cdeffd4e7ab