am 2a9bd871: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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