[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 skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 da4fe152 is in history
Change-Id: I7257757ec5e2ac358746bc3c262917f45fac96fa