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

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