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