Change how services are passed up to the stack
am: bf0faed  -s ours

* commit 'bf0faed3597b92d950febafcf555ad05529559d6':
  Change how services are passed up to the stack