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

Change-Id: I1524a1cd097f8394cf067f61880efc55f7e48627