Snap for 5801051 from a6dcc979eccb3a69cf6558e30d791e5c7186bf7d to qt-c2f2-release

Change-Id: Icab85a640d9203a0b7ba6336d0945d88d0e185e4