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

* commit '2647d2e70e089eafbf7e4b1478e8de1aeddf5588':
  Create Service and ServiceManager classes