Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6ee2d7e11 -s ours am: c3190d5fb2 -s ours
am: f73fa63fe4 -s ours
* commit 'f73fa63fe444ab2f93ca164890667ed2a53cada1':
Change-Id: I718780cb1435783e2628851c4e5409ea9bfab99e
This commit is contained in: