Merge "Set SPI Allocation Timeout to One Hour"