am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit 'f921a587842a5b1df59030e38e115e1b830b3164':main
commit
d901066bf6
* commit 'f921a587842a5b1df59030e38e115e1b830b3164':main