Merge "Merge branch 'tizen' into 'ckm'" into ckm