[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: c7f3e3be -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 6fba2a8b is in history
Change-Id: I6b69b679ba99284fa36fd3a8a705ca80631f6cf6