am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '21416b8318ae2dd63296a255ae8bc0f0bdda1fa4':
  Import translations. DO NOT MERGE