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

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