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

* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.