Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev