Merge "Allow configuration of the number of tombstones." am: 3e8d923276
am: 216ac36534

Change-Id: I2a7b3950d841b7d458c0a66f402f49780caae6a0