Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev am: a1b10fcdb9  -s ours
am: 3bd3fb4488  -s ours

Change-Id: I1f881ef6552a25bfc5c49b81bf4dcffcc68194eb