Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6ee2d7e11 -s ours am: d2308ffe10 -s ours
am: f358f770a2 -s ours
* commit 'f358f770a2941e70acb2ec7ef770954ca39c5af6':
Import translations. DO NOT MERGE
Change-Id: I770fdbcef81c3ae88fa552ed83b7105e5cf6b2f1
This commit is contained in: