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

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