am e9ad9899: am d9ecfa00: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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