Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: e30eb8b3ba -s ours
* commit 'e30eb8b3bac31c09b9a68e74b40f497a8e1c570f':
Import translations. DO NOT MERGE
Change-Id: I9c3b3fe14de85880737f58a67b649b90685121aa
This commit is contained in: