Merge "Rename dump methods to dumpState" am: c72b9a3ce4
am: 219df2fd5b

Change-Id: I0597aa09cf66820708b125421e0814d1c1f6a4ac