Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: f47a2c9fb9  -s ours

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