am a566ca3a: (-s ours) am fe14070c: am 70731879: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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