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

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

Change-Id: I11964b2a7788bbcc85a5c5b8d3e84acd77a8116d