am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5':
  Import translations. DO NOT MERGE