am 96d558cc: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '96d558cc191fdad33ed85211dc84420d4746d75f':
  Import translations. DO NOT MERGE