am cc2ed2e9: am 28b3222b: am e00614f8: am 9c5eb110: am cd550c66: am f6236e7e: am e18fdf80: Merge "Fix a bug with surrogate pairs"
* commit 'cc2ed2e91a724a92f31f2f555f03fb589c838fbf':main
commit
aaeee8815e
* commit 'cc2ed2e91a724a92f31f2f555f03fb589c838fbf':main