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

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