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

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