Cleanup:  Move api check to ApiHelper

Change-Id: Ifc0b080713329d09cdeaeec5ccdf88d8515e5543
2 files changed