Get service by value instead of reference
am: 61a6d26aab

* commit '61a6d26aab95870279b274e565c1495748befde0':
  Get service by value instead of reference