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

* commit '521db337f3aa4e72e047b00aa5bee086be2b0434':
  Import translations. DO NOT MERGE