Move the remaining API client classes to use the APIClient base class.
Created attachment 73656 [details] Patch
Landed in r71850.