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

Change-Id: I5dd67e4f5ccabd9b0541cd7e018bef672ce0be99