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

Change-Id: I25d2ba1843ac79d1b23be64d3e19771f419e50e0