am 684a63f1: (-s ours) am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '684a63f169ec3f34aa23e0b47df1158e1d230bcd':
  Import translations. DO NOT MERGE