Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9eb610598e  -s ours
am: 6bdc25f176  -s ours

* commit '6bdc25f176cfd5c3603f4b1e7849161ab8a76475':
  Import translations. DO NOT MERGE