Merge "PII info logging cleanup in CallsManager" into tm-dev