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

Change-Id: I1a6ca6a0a9dc9b4ee03bc6413ea0048118b9777c