Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 8388f5f8c2
-s ours
Change-Id: I1b3528f925e5f8dad3c1ce74813d3df0903cba95
main
commit
e745612d10
am: 8388f5f8c2
-s ours
Change-Id: I1b3528f925e5f8dad3c1ce74813d3df0903cba95
main