Merge "Rename dump methods to dumpState" am: c72b9a3ce4 am: 219df2fd5b am: bb6d63ad52  -s ours
am: bab60e2706  -s ours

Change-Id: I6e19272c6278ca3f66f1af4b0ca4e9b352ae6b91