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

* commit '8f99107bbb612fc10fe8640021a4258f3287f1ec':
  Import translations. DO NOT MERGE