Merge "Declare support for Ethernet if the service is running." am: 0d3d35b30b
am: 5ada8e56f8

Change-Id: I8cbd09623b419f14a52f722740580c6ae6de7613