Merge "Fix special handling of a fake language code "tl"." am: 9fd2af6b32
am: 30e321b54a

* commit '30e321b54a589d33dc7f2dd7344bef95faaaf83d':
  Fix special handling of a fake language code "tl".