Fix JSON validation errors

Closes-Bug: #1283714

Change-Id: Ibe55d44ffcde65cb236d547cccfa2eb83e1aca66
author: diane fleming
Merge "Fix JSON validation errors"