Merge "Don't explicitly log tid"