Fix XML and JSON validation errors

Change-Id: Iaca924b0015739b5e12c6ca208da8458a4a84a1e
author: diane fleming