am 884304d4: (-s ours) am 4ac518df: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '884304d44a7f5caea300bcf188b634a68c6237fe':
  Import translations. DO NOT MERGE