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

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