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

* commit '5c917161760ab198fb82d3a5a309c5aa7dd389d5':
  Import translations. DO NOT MERGE