am 99403af5: (-s ours) am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '99403af5bb2b9ae61e0feb0e4aaac0874c1362d1':
  Import translations. DO NOT MERGE