am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '05e16515399192130b738446a6c38374cf65e85b':
  Import translations. DO NOT MERGE