Snap for 5631102 from 3f4749043d815aec0dbe285cb50c6a1e312207b7 to qt-c2f2-release

Change-Id: Ia983b2d1db478ed729196f93d5865360bbf5cf24