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

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