Snap for 5781865 from 46b82fd3cebfa4fc5f85f6c7d50fa18ae7cf8720 to qt-c2f2-release

Change-Id: Ida5e974abcd32891cda02de003605e782f4198cd