Improve XML formatting of several XML files

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