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

Change-Id: Ibbf6e47c2241f03998a8321aed78f819c87c40e7