am 2a0e4094: Add MAC for remaining service_manager functionality.

* commit '2a0e40945b5f7adf2055b2f439b3ba4c6389ddc3':
  Add MAC for remaining service_manager functionality.