am bfa6ddd0: Merge "Support deprecated language codes."

* commit 'bfa6ddd02d699f43915cba8027ab324d234b4836':
  Support deprecated language codes.