Merge "dumpstate: remove the arbitrary limit on tombstones." am: e98cb32bba am: 74de98b492
am: c1b4fe3c2d

Change-Id: I7e841374ce6f936b8cc89693071b7bdd25d8dc6e