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

Change-Id: I6b23015ffe607cffb8341272fa4b640ce06135a8