am 620ff342: Merge "Don\'t leak PII into the logs." into lmp-dev

* commit '620ff342d30c30306d1aa73ec65e209dd3141ff0':
  Don't leak PII into the logs.