Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am: d90b69ff am: 3e73c0c9 am: b15d2952 Change-Id: I6af362f8291b364b46ab0c957e273c124e30a20b