Remove dependency on Services_JSON class

This prepares us for removing the class from core.

Change-Id: I88c5c4f01edc0a8635b93fa2f16504e22d08eeb0
Merge "Remove dependency on Services_JSON class"