am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1fee49529e6310a2fc163f004e5f5299d006cb2f':
  Import translations. DO NOT MERGE