Merge "Use String.equals when comparing conflicting providers"