redact PII only for non-null value and apply SHA-1 am: d0a7649f53 am: 00396c01f6
am: 7ae64354f9

Change-Id: Idfe56dbfb17c9453335074873f1b036c23e21a58