Merge "Fix ethernet enable / disable API"