Merge "Rename dump methods to dumpState" am: fb14b87d44
am: cccf9268d5

Change-Id: I068c5f5dc106c5b24d19bc1f4f384caa83c021ef