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

Change-Id: I5d962b9e1e82a57ab43f32f6303242fe8a887125