am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '227d704f64cb7783b8626770ddbbfb151c843f99':
  Import translations. DO NOT MERGE