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

* commit 'd173b10a930b56cfd71ca36d0051230b3f9593c1':
  Import translations. DO NOT MERGE