Improve XML syntax and formatting (controller)

Change-Id: Ia2d7dc482695c4e28ec97f64bdf9c2cb667b4e4a
Merge "Improve XML syntax and formatting (controller)"