Merge "Fix nosdn fdio scenario" into stable/fraser