Merge "Fix SecGroupQuotaTest in case of unlimited quota" into mcp/epoxy