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

* commit '9561ec3353753c9b79b03a910725b33d2628c7ab':
  Import translations. DO NOT MERGE