[automerger skipped] Merge "Make Ethernet interfaces more testable." into...
[automerger skipped] Merge "Make Ethernet interfaces more testable." into rvc-dev am: 0c36573a -s ours am: e9a8f2c6 -s ours am: 2226703c -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 6fba2a8b is in history
Change-Id: I64cb789c224a588983de7caed9f4919b196e2119