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

* commit '85a71d6a622eef2cc5258e737c305227cebe2e95':
  Import translations. DO NOT MERGE