am aab51473: Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev

* commit 'aab514738e346aae410a5a8339e2610a3b393bc6':
  Fix bad xml generation due to mismatched start/end tags