Merge "Make Ethernet interfaces more testable."