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

* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
  Import translations. DO NOT MERGE