Merge from tizen_3.0

No match.