Merge "diag: Change format used for printing pointers"