am eaa70d72: am b97aadec: am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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