Merge "Import translations. DO NOT MERGE" into nyc-dev am: 397506f9b4
-s ours am: de64ac8599
-s ours
am: 2b10bb6548
-s ours
Change-Id: I4b9558f7c48783fcb59394f2e112384a54d164bb
main
commit
f69f6d38ad