Merge "Import translations. DO NOT MERGE" into nyc-dev am: 619dc1aefd
-s ours
am: ed159a8a4f
-s ours
Change-Id: Ia34a14fe1c90d3f6246c1ed6e6c31362e111c2f9
main
commit
2aa0d6d2a5