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

* commit '126c6bdd2555463b457d5a42fe8f665cda921072':
  Import translations. DO NOT MERGE