Merge "Include both eth%d and usb%d ethernet interfaces on V+" into main