Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours am: b1be124b15  -s ours
am: 3350974f82  -s ours

* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
  Import translations. DO NOT MERGE