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

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