Merge branch 'ckm' into tizen

No match.