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

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