JSONContent --> JsonContent per rename in core

Change-Id: Iec7ac9eccb0bfe951032a614aac8cb7eb8cc9dc7
Merge "JSONContent --> JsonContent per rename in core"