am 91f67606: am 54097016: Merge "Be more lenient with 4 byte UTF-8 sequences."

* commit '91f67606509d26b95e5837c32cd3dbdb4c2f4620':
  Be more lenient with 4 byte UTF-8 sequences.