Implement new service API

Change-Id: I9f9bd5360e7a90cdf905340e55e148e4d22aed39
2 files changed