Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours am: 652af4f813 -s ours
am: db565bd516 -s ours
* commit 'db565bd5164c75184588d82f6f16b48715eb4cd3':
Import translations. DO NOT MERGE
Change-Id: I219e46e4ec657af17fddd3dc0633f2a45757f014
This commit is contained in: