Merge "Increasing TombstoneSection timeout to 2 minutes." am: 0119603e8e am: c87180623d
am: 60a98f0cb7

Change-Id: I6508c83edd2ad5364b9598d90d029a50e3e3846c