Merge "Import translations. DO NOT MERGE" into nyc-dev am: 196c7f7  -s ours
am: e70198d  -s ours

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

Change-Id: Idf59d4afa4a8dfde76d6b0aa51ceffd0eeac7f84