Snap for 5817401 from c8dbab9f8642d7b02dc97861fe797b90beaa1f21 to qt-c2f2-release Change-Id: Iacdd054fbe433e374d29d6b26cc4d7203daeba1b