am 8966fd38: am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes."

* commit '8966fd383b6a91426871784590e2cc8a79f4fa5b':
  Support deprecated language codes.