Merge "Reduce timeouts for occasionally-stalling sections"