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

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