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

Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d