ApiBase is a context source

Change-Id: I48e23faa451be1d542c8d64a23e71086477c6511
Merge "ApiBase is a context source"