Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b731377822
-s ours
* commit 'b731377822c212b7742cdf61fac918a30f12a1b4':
Import translations. DO NOT MERGE
Change-Id: I293ec249d6183e977d0c3aa2d11b6e41812f9252
main
commit
cd0838076d