Change from ServiceManager- to ComponentContext-based implementations

Change-Id: Iba701c520ad27925bb5e67697e22132b53160ab2