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

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