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

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