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

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