Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ba37abb2b6
-s ours am: e41296b676
-s ours
am: 6ef4fc0cdd
-s ours
Change-Id: I54c5f7ab8b49b67df6d2806c36dac95340281ae2
main
commit
025f6d9fb1