Merge "Set SPI Allocation Timeout to One Hour"
am: 78ca1fecef

Change-Id: I1919dd54d7c64e8a58f6397145e605ec1eb8c356