am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '8636ba03a7163d4bc2c81b8bddb1152944f9981d':
  Import translations. DO NOT MERGE