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

* commit '07ec79d269bf565becb2eb096dc28c1bb953a4be':
  Import translations. DO NOT MERGE