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