[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b...
[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b am: fc333091 -s ours am: dd073335 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 da4fe152 is in history
Change-Id: I6d96ff6a180c220d763ff23db18328d1964c767f