Changes xml attributes to end instead of right

Change-Id: Ia1208f9de21fe0f7473377685c82ea0a2da6f548
5 files changed