am fca736b8: (-s ours) am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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