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

* commit 'c65038cee696fe9246a43b7e2758ccf28fa264d5':
  Import translations. DO NOT MERGE