am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '44718c4b8b3c7655ecc34981c8ee41e1daf34f00':
  Import translations. DO NOT MERGE