Merge "Rename dump methods to dumpState"
am: c72b9a3ce4

Change-Id: I41cc42a6838c6e42bf257d8304f99d5ca8d74ab0