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

Change-Id: Id9b5435b3e309206a6a924005be240986bc46663