Merge "Fix Lint errors for network logging API"