Merge "Change how services are passed up to the stack"
am: 2ebc12b

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