Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours am: f3dfa54f79 -s ours
am: abb5a753cf -s ours
* commit 'abb5a753cf9ec68d7c44e9ee5bcfd641876dfcda':
Import translations. DO NOT MERGE
Change-Id: I647cabe57ed712473765755305005d7b911e1f93
This commit is contained in: