Merge "Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b am: f71c95dfe4"