Merge "Rename dump methods to dumpState" am: fb14b87d44 am: cccf9268d5 am: 4c4bf14f5f
am: 8d7b98a66f

Change-Id: Id51310cf80c28d89e81d45612af9cec7f6c04cf6