am 2a06b43a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '2a06b43ac56557e62a357b9b0928059a67c63c56':
  Import translations. DO NOT MERGE