Merge "Fix DumpString to read the right amount of args" am: c4d71c3f am: 6887add4 am: b5cf91ba am: cddcd8a8 Change-Id: I11da6e150e0b94554e99cdebdd48c5375febb0df