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