Merge branch 'tizen' into new_text

No match.