Merge "Set SPI Allocation Timeout to One Hour" into pi-dev am: 1f70d1cac5  -s ours
am: e18e426131  -s ours

Change-Id: I339cf4e2a1aa6f80cab6e441243caeb5a78c25ab