am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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