am bc25a20e: (-s ours) am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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