am 1f428ace: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1f428ace1b1e667dc1528543324048afaf918ed4':
  Import translations. DO NOT MERGE