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

Change-Id: Id46f7bc8ec484fd0bb4972566bda06cb6c45b962