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

Change-Id: I78b7d1e1f68d5dcf2b1532e04681d3aa5c14e33f