Merge branch 'tizen' into ckm