am 9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '9aa2d2a5a56c5ec0bb8517f46cb39f6c12215d92':
  Import translations. DO NOT MERGE