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

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