Merge "Remove _remove_router_interface_with_port_id()"