Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 0246325287  -s ours

Change-Id: I2392365e4d95365400ce092c70234f9ad0e6ae2e