Merge "Remove unused _add_router_interface_with_subnet_id helper"