Merge "Don't leak PII into the logs." into lmp-dev