Merge "Improve sock_diag debugging code."