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

* commit '5409701651407747e172d753f3fddeb6eb423927':
  Be more lenient with 4 byte UTF-8 sequences.