Merge "Improve code that decides whether Ethernet should be supported."
am: 7b63a9afdf

Change-Id: I94442f7818b3da94f468c0532c3eb8013cd959d3