Remove dependency on Services_JSON class

This prepares us for removing the class from core.

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