Snap for 5768201 from 5f1fb46ed9cb002303f53a2c70d0baa233bf5153 to qt-c2f2-release

Change-Id: Icf716d0660b0dbd318e038e840be0870a276ced4