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

* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
  Import translations. DO NOT MERGE