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

Change-Id: I327708f584e7b25f9c9f3068a6fd556ed76526fc