Merge "TrustAgents: Improve debug logging"