Fix invalid XML

These files were not valid XML files, fixed now.

Change-Id: I1332f58d71955efef5ad08ff9c69956e45fd6f14
Merge "Fix invalid XML"