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

* commit '3122eedcd3f2e378a96d9486d6418449414059ac':
  Import translations. DO NOT MERGE