Merged the capi from tizen 2.4