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

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