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

* commit '208daa1d76a65423c9d32b0b8414d13c419db7b1':
  Import translations. DO NOT MERGE