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