Merge "ProviderTest: Add provider name to failure message."