am 6778548d: (-s ours) am aee26e8c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '6778548d7cc84426162f8ef208a52575cd2db969':
  Import translations. DO NOT MERGE