merge from tizen_2.4.

No match.