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

* commit '762906e33e88a9ee06a407fe21be5bad0c68ea74':
  ProviderTest: use the correct provider object when creating a service