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

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