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