Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ada5c5f12f
-s ours
* commit 'ada5c5f12f3947742aa6d7c2f38152237b5e5dad':
Import translations. DO NOT MERGE
Change-Id: Ia718e105ee0beaa722c7fad3e2dce28e48f98620
main
commit
46f9215c7e