am acd840d5: Merge "Obfuscate any phone numbers that pass through the event log." into jb-mr2-dev

* commit 'acd840d5c31bee48cc13a03f5e0c5e3b69ff23db':
  Obfuscate any phone numbers that pass through the event log.