Snap for 5730727 from 8a3c753de11d937ab0ffe2f64cede1d1c6ff14d4 to qt-c2f2-release

Change-Id: I64d57fad972d7e52aaa20f29de239e3bcebe8aa4