am 4e90bb53: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '4e90bb536ae7430978eeef5c287b11a72ea4c023':
  Import translations. DO NOT MERGE