Snap for 5636702 from a97ce0ce9cf5814f0fbfac85fea95c9972c1bfef to qt-c2f2-release

Change-Id: I1095d193e0aa2697e8d0a8c8b5c6f8eb76ce3573