Merge "Redact key value from log when DEBUG is false"