Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 6d9e1cf -s ours
* commit '6d9e1cf79a66ea5c5bb949aa58daf4a28a4912d7':
Import translations. DO NOT MERGE
Change-Id: I5d6ba75f275573c97e9db74e054a8a176a920ba4
This commit is contained in: