am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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