STYLE: Clean up XML files in Applications

Change-Id: I5e827fbac4b0dedc7136d011b9c0f5f610171756
Merge topic 'CleanUpXMLFiles'

3f7b2ce STYLE: Clean up XML files in Applications