am 2aa64c7e: (-s ours) am cbaba60f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '2aa64c7e0f6491467e29a14a4cfe391c0b6092bf':
  Import translations. DO NOT MERGE