am 0bd868b8: (-s ours) am 7d38748d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '0bd868b8ef8484cb4cb03219fc5d5b0f788fa33c':
  Import translations. DO NOT MERGE