Improve XML formatting of several XML files

Change-Id: Iac68540f01eb26ae07d1caf2377bb4fa3d0eae69
Merge "Improve XML formatting of several XML files"