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

Change-Id: I02412d6d4a77f847f3eef6e822664cc10dd6768e