Merge "Fix a couple minor bugs (bug 2404859) in TraceDump.c"