Merge "Fix quota tests for static credentials" into mcp/stein