Merge "Move channel logging to dump method and redact name."