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

* commit '210b38d767f38812f5866057b7d074e80d287ffa':
  Import translations. DO NOT MERGE