Merge "Import translations. DO NOT MERGE" into nyc-dev am: 85964c84f5  -s ours am: b7b93b5658  -s ours
am: eab0f74d41  -s ours

* commit 'eab0f74d41bd8d57132cf057f17d084fb1c5212c':
  Import translations. DO NOT MERGE

Change-Id: I92b891e4fd17d1a066f230f58f48daa8183e0f4c