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

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

Change-Id: Idf85804a506d137bc609c62897baeef713c84f12