Revert "Remove unneeded setupComplete stuff from api base"

This reverts commit 078dd5d38d88710c64a3b77da5a77d33da0054a1.

Change-Id: Ic39b5b61272e7d0f257aa434b6ee2feb7d4488ae