am 7ba940fd: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '7ba940fd3af359e71b1980fd8781256136f60b67':
  Import translations. DO NOT MERGE