am b7232a2e: (-s ours) am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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