Merge "ProviderTest: use the correct provider object when creating a service"
am: 2428e4b908

* commit '2428e4b90808d0acad5cde1c28a2815a2b165247':
  ProviderTest: use the correct provider object when creating a service