Snap for 5743241 from fb75cf7a608f4aa376a6fa3cf6b1201e3bea6f8c to qt-c2f2-release

Change-Id: Ieb688a31cbe0315a57ebfef908f4ac5e199f2f47