Merge "Fix linter warnings in netd tests"