Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: b697973e2a  -s ours

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