Merge "Improve support for non-BMP characters in XML." into lmp-mr1-dev