Merge "Improve netd detection"