Fix derp add C Spire

Change-Id: Ibeb8aac4ced8126c72e62ce9e88f8d20576fe488
Merge remote-tracking branch 'github/kk4.4' into EXPERIMENTS-1