Snap for 5636702 from a03204da665fec772e9626f0e6cbf18846d25649 to qt-c2f2-release

Change-Id: I9bb748a4df974a21db7f8b9cf11a753865141690