am b05e2286: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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