Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours am: a0159dfc08  -s ours
am: b8758b39a9  -s ours

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