[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b...
[automerger skipped] Make Ethernet interfaces more testable. am: 6fba2a8b am: fc333091 am: 98faf4a8 am: 724885e6 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 6fba2a8b is in history
Change-Id: I4d7343bf75a91af7d3ca216aeb908c12c4276216