am c585612a: am 779a19fe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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