Fix JSON validation errors

Closes-Bug: #1283712

Change-Id: Iea9a63251b7702a33fcdb54c71bfc638774d0418
author: diane fleming