Merge "Don't redact if caller is owner and add redaction test"