Merge "Fix assert for public networks with multiple subnets"