Merge "Fix up provider internal/external APIs"