Fix WADL errors - part of JSON validation

Partial-Bug: #1283712

Change-Id: I9e689cdb3d7ac3cce4e2a3dd2c0e5c6d53780e40
author: diane fleming
Merge "Fix WADL errors - part of JSON validation"