Merge branch 'ode' into tizen

No match.