Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev