Merge the code from tizen_2.4

No match.