Merge "Redact key value from log when DEBUG is false" into sc-v2-dev