Merge "Modified an api call flow" into tizen_2.1