Merge "Make APIs abstract once AiAi has implemented them." into sc-dev