Improve stability of XML entity conversion

Change-Id: I341b76b9d898acd59cae0379aa5cc4a5bbbe81e8
4 files changed