am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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