Merge "Fix DumpString to read the right amount of args"
am: c4d71c3f96

Change-Id: I126d42d8c3e4330935f0dd5926bd6430bb863c3f