Merge branch 'tizen' into tizen_6.5