am c7d0cec7: Merge change 22040 into donut

Merge commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511' into eclair

* commit 'c7d0cec7e83d5194c35e88b17d3acc937fa87511':
  Fix broken XML generated during "Extract string"