Merge "Make TLS logs more readable"