am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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