Merge "Use consistent naming for allocating SPI."
tree: f6a51cd216bc341db5757010ca07ff70707c8e00
  1. core/
  2. services/
  3. tests/