Merge "Fix identifier size in the heap dump."