Update service and service caller.
Revert "Update service and service caller."

This reverts commit d3e5b7afea73a92428c506b2652a1f3052132756.
Update service and service caller.
Merge branch 'master' of https://github.com/jargil/odp_hackfest1