am 32f4b469: (-s ours) am 47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '32f4b4690ee39986595ad0803070f112e06203ef':
  Import translations. DO NOT MERGE