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

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