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

* commit 'cd64ce8720d1b590a670f01bd7ad4e158cdda750':
  Import translations. DO NOT MERGE