Merge "Increasing TombstoneSection timeout to 2 minutes."