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

* commit '224083b8a12f00427194216c1d29f3744ee9d30d':
  Import translations. DO NOT MERGE