Merge "Fix spurious "Timeout waiting for provider""