am 966fd1b2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '966fd1b2d825df4c1ba4c88a45934067ea56ae08':
  Import translations. DO NOT MERGE