am 248dc760: (-s ours) am 39949bb0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '248dc7602fa571738ea4b993e77a01f798acf6ed':
  Import translations. DO NOT MERGE