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

Change-Id: I6c523c75801518b8cee7aa375b9b58f0914d150f