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

Change-Id: Ifaff2fa1b8e9dc329b42d6e845851a524b6bb6fc