Merge "Import translations. DO NOT MERGE" into nyc-dev
am: e303983 -s ours
* commit 'e303983e5ddd4c86284ea95dad5c64f79f49e52c':
Import translations. DO NOT MERGE
Change-Id: I6415fff0a6bb98a571d7a5376c589ea23a353d53
This commit is contained in: