Merge "Fix ethernet enable / disable API" into tm-dev