Merge "Fix DumpString to read the right amount of args"