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

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