Merge "Error when adding SR-IOV interfaces in SR-IOV context"