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

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