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

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