Merge "Fix nosdn fdio scenario"