Merge "Import translations. DO NOT MERGE" into nyc-dev am: 397506f9b4
-s ours
am: 80bcbf5b2c
-s ours
Change-Id: I8667f0f0f7bae1a36e1a2303ae867dd95a64d73c
main
commit
513e060369