am eb97c0dd: Patch new JSON APIs with changes informed by GSON.

* commit 'eb97c0ddc063176c26065fc6855188edf0c16e03':
  Patch new JSON APIs with changes informed by GSON.