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

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