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

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