api: Use new callback interfaces

Change-Id: I1871df54c3061c0c8d5765ff69207b8307bc7569