Merge remote-tracking branch 'origin/tizen' into new_text

No match.