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

Change-Id: I891c8e0150f073696f2c62d4514b5d94bae250a8