[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b -s...
[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b -s ours am: f2ba1877 -s ours am: 8bde0e20 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 6fba2a8b is in history
Change-Id: I14e12f6034017c6f8bc758ca453f4bb11d9d81e2