Merge "Minor netd refactoring (logArguments)"