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

* commit '29217bcd651d1ab968d01744533aec009fe252da':
  Import translations. DO NOT MERGE