Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970
am: ace309a7ad

Change-Id: I6a1e8364c3e0801cf75e13920606ec04a1054e12