am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes"

* commit '4036f5ab2ffbe5a2e47d46aa376e9791385cc31b':
  Create Service and ServiceManager classes