Merge "Use consistent naming for allocating SPI." am: 816f0ebaab
am: 4753ed4b1b

Change-Id: Ib5d89044313341790b1ee9271642072ddce181af