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

* commit '6f63adbe936cf9b3e690c4b40b0ac2e8d41f371b':
  Import translations. DO NOT MERGE