Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353  -s ours am: 6dfc27dac9  -s ours
am: e521419909  -s ours

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