Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4024459  -s ours

* commit '4024459f0dead33dee901e0d6b6b53fd6e16164f':
  Import translations. DO NOT MERGE