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

Change-Id: Ifb9389c6252139bb656c1dd991261d9d8b6430e6