Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI"