Allow configuration of the number of tombstones.
am: ebdea0ad1b

Change-Id: I818de36294b84921b7f198777c2cfd6b6da9580b