Use Xml::element instead of Html::element for empty elements

Change-Id: I7bee5740896e11d7cfef05c6c0e56931d6223a57
Merge "Use Xml::element instead of Html::element for empty elements"