am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
  Import translations. DO NOT MERGE