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

Change-Id: Iaf9ad0d4b3d784acc891697438fadcfb3a73ab54