Patch new JSON APIs with changes informed by GSON.

Change-Id: I86c12a123080cc06ab23d11d1563bb52c5902517
6 files changed