Merge "Remove hashing for PII in Telecom Logging"
am: e77808d936

Change-Id: Ib3e5180536ded4094c65476f5d5203f6c094f204