Merge "Clean up DumpData-related functions" into pi-dev
am: 152e3179d6

Change-Id: I3ed5755d6cf26a741c2aec97b6f9511a6c8c1366