Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours
am: f089201e2e -s ours
* commit 'f089201e2e574f6a3bce81253b385d6f67d20532':
Import translations. DO NOT MERGE
Change-Id: I5b1436cfb9cb51a6be47e6e7c52556727f8811e5
This commit is contained in: