Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fc41735835 -s ours
* commit 'fc41735835f047feb8836fb26dbaebb81c3357a9':
Import translations. DO NOT MERGE
Change-Id: Iee72c104b9f74554e9c3132f70f22916e3ef9f6c
This commit is contained in: