Merge "Rename dump methods to dumpState"
am: fb14b87d44

Change-Id: Iae512389926515efa031b7ef91fd5aaec8ee7785